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