Merge "Fix issue with wrong style being used in landscape" into tm-dev