Merge "Fork navbar layout for quickstep" into pi-dev