Merge "Skip package updates when user is locked."