Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into udc-dev