Android updates

Minor tweaks to allow various states to display properly on android.