Merge "Restore scissor state correctly" into jb-mr1-dev