Merge "Force update the disable flags following status bar registration" into tm-qpr-dev