Fix #1640 : Only add search engine subscriber when the app is setup
Merge branch 'romainneutron-fix-1640' into 3.8
Merge branch '3.8'