Merge "Use startOp/finishOp to show location icon for non-framework location" into qt-dev