Merge "Handle enable/disable of non-framework location attribution apps" into qt-dev