Merge "Controls detail panel - handle back press" into sc-dev