Merge "Add support for a new developer setting: overdraw debugging" into jb-mr1-dev