Merge changes If0b865ac,Ie0c61300 into jb-dev

* changes:
  Move BigPicture's header to the top of its large view.
  Action button improvements: