master: more progress on mobile optimizations