Merge "Use flags to indicate reason for Uri changes." into rvc-dev