Positioning fixes for Android