Merge "Shade back action handling for scenes" into main