Merge "[DO NOT MERGE] Controls - Do not recreate intent" into rvc-dev