Add layout for Nexus 7.
Merge remote-tracking branch 'origin/master'