am 40ca751b: am ebec2315: Merge "Always report user switched after unfreezing...
am 40ca751b: am ebec2315: Merge "Always report user switched after unfreezing screen." into jb-mr1.1-dev
* commit '40ca751b':
Always report user switched after unfreezing screen.