Merge "Restart home controls activity when dream is redirecting wakes" into main