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