Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into tm-qpr-dev