Merge "Defer process mode upon draw" into jb-mr1.1-dev