ios6 UI fixes
Merge branch 'master' into v3.8-overlay-swipe