Merge "Always report user switched after unfreezing screen." into jb-mr1.1-dev