Merge "Fix duplicate status bars once and for all"