Merge mobile stuff back into 0.3.x.