Merge "Update non-framework emergency location request notification" into qt-dev