Merge "made the pressed state white" into jb-dev