Merge "Only notify when admin enables location for the user" into rvc-dev