Merge "Align screen lock options to view start" into oc-dr1-dev