Merge "Fix pattern lock display in tabletop posture." into udc-qpr-dev