Update layout for iPhone/iPad on iOS 7
Merge branch 'update-settings-view-layout-ios7'