Merge "Fix the “screen lock option” and password restriction view are in the...

Merge "Fix the “screen lock option” and password restriction view are in the wrong position on PIN/Password/Pattern in the landscape mode." into udc-qpr-dev