Merge "Make confirm lock screen use the right theme" into oc-dr1-dev