Merge "Fix failing test TaplTaskbarTest#testHideShowTaskbar" into tm-dev