Merge "MSIM: Rework statusbar, order signal clusters to match settings" into cm-11.0
(cherry picked from commit 5144e00a3dd7b349ac4e7ee3430a252b550df8a6)