Merge "Update to show new location monitoring op."