Merge "Make QS signal indicator act like a QS signal indicator" into oc-dev