Merge "Fix activity does not relaunch after config change." into rvc-dev