Merge "Revert "Enable @PortraitLandscape for testBackground"" into ub-launcher3-qt-dev
am: f58d811e98

Change-Id: I7a393319d6d619ea9b8655d74702e99579b1c16d