Merge "Use startOp/finishOp to show location icon for non-framework location" into qt-dev am: 2966db7c0a am: 41e67f43b1
am: a59b212ecf

Change-Id: Ic72d4f45256ae4b7ccc4427f70aec3668983b284