Merge "Fix for missing location icon" into pi-dev