MobileFrontend: cherrypick https://gerrit.wikimedia.org/r/#/c/134405/

Change-Id: I3fc2a227014632dbb5ae750ca8f0e121a75eca96