Revert "Mobile: merge develop"

This reverts commit b234644949887a95d1d2322e7c0647dac3882144, reversing
changes made to 8f59f8fe0051afadad78ff8937758412edb5b9c2.