Merge "Delay releasing UpdateLock when screen is in foreground"