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

Change-Id: Id6e012c28b1d3e5616650ca6ebd30c5d5077ffbf