Merge "Avoid triggering support dialog in non-current user." into nyc-dev