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