Merge "Fix bug that prevented waking from dream" into mnc-dev