Merge "Fade display in when waking up"