Further refinements to mobile compatibility
Mobile branch merge
More mobile updates