Merge "Change Browser location pre-grant to fg-only" into rvc-dev