Merge commit '5d81e8c82aa8d55eff2c2c78e4a553c479332187' * commit '5d81e8c82aa8d55eff2c2c78e4a553c479332187': Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout
Merge commit '5d81e8c82aa8d55eff2c2c78e4a553c479332187' * commit '5d81e8c82aa8d55eff2c2c78e4a553c479332187': Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout