Merge "Fix empty signal line thickness / color in status bar" into oc-dev am: 91870d1587 am: 090807e840
am: 2fa789484d

Change-Id: Iefff86d8e16badf86337184864b2f50511425203