Merge "Fix the super_status_bar to be compatible"