Merge pull request #7677 from crdlc/bug-831656

Bug 831656 - Homescreen tap/swipe breaks on non-target devices [r=jordan...
Merge pull request #7801 from alivedise/bugzilla/833619-v4/nck-code-length

Bug 833619 - NCK max length, r=ochameau, a=blocking-b2g:tef+