Squashed: Readd 4.3_r3.1 mobile changes

This reverts commit f297ac49abeaba46d2c24273d1454da6e81dcc82.