Merge "Reconnect "full width" shade logic with scenes enabled" into main