Merge "Disable "double tap to check" when "always on""