Merge "Rotation lock fix for sensor{Landscape,Portrait} activities."