Merge changes from topic "navbar_fix" into pi-dev

* changes:
  Allow resolving the quickstep service when the user is unlocked
  Revert "Revert "Nav icons and quick step states are determined by service enabled""