Merge "Disable tap to switch pages on phones"