Merge branch 'android-updates'

Fixes edge-to-edge layout issues with the settings and application
selection Activities.