Preview: First attempt to better support Android