Merge "Nav icons and quick step states are determined by service enabled" into pi-dev