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

Change-Id: I93b2354c2d9e0f75b2a9bf60c5a9a03dcd74fffa