MobileApp: cherrypick https://gerrit.wikimedia.org/r/#/c/137930/

Change-Id: I19004f7ee1655239e5a9b05b5f2191aa0bc23626