Merge "Screen magnification should disengage on screen off." into jb-mr1-dev