Merge "Revert "Do not finish lockscreen for multiple sims."" into udc-qpr-dev