Merge a part of commit of original repo

Merge a part of these commit of original repo.
- Fix missing buttons in landscape mode in Nexus 7
- Fix preview buttons size on some devices