Revert "Revert "Bug 985787 - Change requireApp to require to make includes work in search unit test" for possibly breaking gaia-ui tests on tbpl" because I didn't mean to revert this patch with everything else I reverted

This reverts commit b3564260d93fcf7d5127de26bb7f45d13b893a42.
Revert "Merge pull request #17263 from gasolin/bubble-merge225" for possibly breaking gaia-ui tests on TBPL

This reverts commit 27c414d178694a17e7a2967fa377938163ac44ae, reversing
changes made to e592ec99013a43002171d1bd4be2f497c12ada88.