MobileFrontend: cherry-pick https://gerrit.wikimedia.org/r/#/c/132299/

Change-Id: I2e50ed6716cae71efffc506de86b3f86242f32cc