Merge "Make QS signal indicator act like a QS signal indicator" into oc-dev am: d2638591d9
am: 7f23f6053f

Change-Id: I8247b0597e4f709dc0306f33a8be39c5e0620258