In order to make https://github.com/mozilla-b2g/gaia/pull/10254/files#r4820592 happen, you're right. This will move in next commit.