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

Change-Id: I1eb26e9d51d35bc7eca7bf9244ae7861f2e47c1f