Merge "Fix ShellTransitionTests on landscape devices" into tm-qpr-dev