Merge "Shade: Factor out DoubleTapHelper"