Merge "Controls - Do not recreate intent" into sc-dev