Merge "Hide keyguard earlier when exiting lockscreen" into udc-dev