Merge "Fix deadzone in seascape orientation am: c8d6603644 am: 4161a104b1"