Adds the accidentally removed pre-honeycomb cell switching
Merge branch 'androidL'