Merge "Add dynamic support for 4G/LTE/LTE+ icons"