am 500b7c2d: Merge "sw600dp pixel perfect tweaks" into jb-dev

* commit '500b7c2d8904530f9d842316a61a31ed96547d51':
  sw600dp pixel perfect tweaks