Merge "Specify surface to existing control panel activity" into main