am 38586bff: Merge "Fix bug that prevented waking from dream" into mnc-dev

* commit '38586bfff9b8194c86f1363d63e971bbbc6ee843':
  Fix bug that prevented waking from dream