Merge "Add user 0 unlock monitoring to postpone user 0 data access"