Story 477: Only show nearby in menu when supported

Change-Id: I106282a302bfdc870b225b85b8b000f65fac4674
Merge "Story 477: Only show nearby in menu when supported"