Merge "Add Callback to wake up from Dream when DreamActivity is destroyed." into tm-qpr-dev