Merge "Revert "[Settings] Resolves unsynced infomation between status bar and settings"" into tm-dev