S2W and DoubleTap2Wake fixes