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

* commit '95548b395d681b0ecfef341058f282f624ae3862':
  Fix GPS icon not showing for secondary users