Merge "Fix control bar overlaping in portrait mode" into pi-car-dev
am: e8303f05b6

Change-Id: Idd8fec4ffc58e35bcce1b0db173a60c57a5ba40f