Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev

* changes:
  fix design/develop boxes float
  add style to add nexus 4 frame to screenshots