Merge "Revert "[QS] Update landscape UI"" into pi-dev