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

Change-Id: I90f524dba0edfdee7b83f71d7f6b69fc9c48855e