Merge "Make non-framework emergency location notification configurable" into qt-dev