Revert DSB changes to baseline and rework them

This commit does what can be considered a revert of the DSB changes
to the MSIM cluster view, which then gets re-reverted with a manual
code review along the way. This should make DSB work as one would
expect on all MSIM devices, making their mobile data indicators switch
colors as well.

Change-Id: I81af99b7851deafc93421b7b0bf2a13ef664776a