Merge "Ensure finish lockscreen when usersetup incomplete" into udc-qpr-dev