Merge branch 'android-state-updates'