Merge changes from topic "idp_grid_name" into tm-qpr-dev

* changes:
  Add unit test and fix bug related to "Migrate IDP_GRID_NAME usage to LauncherPrefs" CL.
  Revert "Revert "Migrate IDP_GRID_NAME usage to LauncherPrefs""