Merge "Fix multiple issues with DREAM => LOCKSCREEN transition" into udc-dev