Merge "[QS] Update landscape UI" into pi-dev
am: 6d0412ee22

Change-Id: I38b8214bf560d406d5f95468419314010cf6f579