Merge "Change back to Device controls" into sc-dev