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

Change-Id: I05db67ee6c7bd9cc7ce03cb2c64f573c39a831ea