Merge "Update 1-bar status bar / qs icons." into lmp-mr1-dev