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

* commit 'b8d8562cc36e5ab2f8b8c5adfd8d4839fe0909d3':
  Always report user switched after unfreezing screen.