Merge "Add flag shade_expands_on_status_bar_long_press" into main