Merge "Avoid triggering device admin settings in non-current user." into nyc-dev