Merge "Fix tabletop autorotate freezing the device in portrait" into tm-qpr-dev