Merge "Controls - Prevent action while locked" into sc-dev