Merge "Fix issue with slippery state for quickstep button case." into pi-dev am: d0bf944c3d
am: 35a97e1a0b

Change-Id: I1261372307c3eef309b9bd8345e19120f1f39763