Merge "New developer setting: force 4x MSAA" into jb-mr1-dev