Merge "DO NOT MERGE: More tests for CurrentUserContextTracker" into rvc-dev