Supress Location button when coming from Location

Change-Id: Ie1f1aed17206530ec7c8a1cde43a4380b7232823
4 files changed