Merge "SystemUI: LTE+,H+ and R icon in quickSettings panel not proper"