am 158c51f3: am 95548b39: Merge "Fix GPS icon not showing for secondary users" into lmp-dev

* commit '158c51f3b84f8870d562e12fcd6b1ba672348fd9':
  Fix GPS icon not showing for secondary users