Merge "Roaming Icon should not displayed with Indosat's old SIM" into klp-dev