Bug 1037383 - [QRD 256MB] Delay of 4-6 sec observed while playing recorded video for the first time
Merge pull request #21949 from justindarc/bug1037383-v2.0

Bug 1037383 - [QRD 256MB] Delay of 4-6 sec observed while playing record...
Merge pull request #21964 from EverythingMe/1040618-migrate

Bug 1040618 - [B2G][OTA] Several issues opening smart collections migrat...(cherry picked from commit 7543ff483b844dd515bfaa6cd219b301047e445a)