am 66e9fa99: (-s ours) am b4fd0972: am 16ed831e: am 3d924f1e: (-s ours) am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev

* commit '66e9fa99a09907cf5afae915a6636c56c0f2fb8e':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]