Merge "Disable testActivityBlockedWhenForegroundActivityRestartsItself" into rvc-dev