Merge "Log when the location indicator is displayed in various situations and...

Merge "Log when the location indicator is displayed in various situations and remove logging from prod implementation so that it doesn't interfere." into main