Merge "Fix permissions update for VrListenerService on user changes." into nyc-dev