Merge "Ignore exception when checking isRotationLocked()" into udc-qpr-dev