Merge "Merge "Fork navbar layout for quickstep" into pi-dev am: 5d8559fea3" into pi-dev-plus-aosp
am: 92b686dd69

Change-Id: Ic2c63428d5f217ef53a6233d01292be26bd89699