Merge "Fixes tapping home button on right edge with quickstep layout"