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

Change-Id: I1ba06ea2b1cb3d0c488e374e895421250297e841