Merge "Supress Location button when coming from Location" into klp-dev