Merge "Reflect settings changes immediately in actionbar." into jb-ub-mail-ur9