Fix incorrect merge
Remove pre-iOS 7 code
Fix overlay rotation on iOS 8