Merge "DREAMING->LOCKSCREEN, lockscreen updates"