Merge "sw600dp pixel perfect tweaks" into jb-dev