Merge "Flag "centralized_status_bar_height_fix" - Change bug number" into main