Merge "Give Keyguard 2 seconds to finish before SLEEP" into udc-dev