Merge "Prevent unintended rotations. Bug: 4981385"