Merge "Correct visibility for LOCATION_MODE_ON" into qt-dev