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

Change-Id: I1a8d503b9d769b1535fe77b2fd5e6ef69fde7987