Fixed 2 crash regressiong from Swift porting

Also:
- Fixed 20pt gap at top of folders and chat controllers on iPad