Merge pull request #20892 from dominickuo/bug-998956-3

Bug 998956 - [MediaDB] Ignore the time difference when it is multiple of 10 minutes and less than 12 hours, r=davidflanagan
Merge pull request #21143 from KevinGrandon/bug_1028688_collection_pinned_push_to_unshift

Bug 1028688 - [Collection] Render icon after an add operation from homescreen
Merge pull request #21017 from azasypkin/bug-1026575-message-preview

Bug 1026575 - [B2G][SMS] Message preview in Messages app thread view disappears after opening app. r=schung