Misc fixes from android work
A whole bunch of fixes that was made while looking into various Android issues. These are the less controversial ones.
A whole bunch of fixes that was made while looking into various Android issues. These are the less controversial ones.