Merge "Locking screen after timeout to dream" into udc-dev