Merge changes from topic "am-045ebb213c1e4280900c806e0c7d95ce"

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into tm-dev am: 7455a41b -s ours am: 0da99117 -s ours am: 681d561a -s ours am: c23c1647 -s ours am: b31b06d8 -s ours
  [automerger skipped] [DO NOT MERGE] Update quickshare intent rather than recreating am: 02938e8c -s ours am: 4c670391 -s ours am: e44eeff6 -s ours am: ae6495ad -s ours am: f166770e -s ours