Merge "Replace Screen system component time with device screen on time" into udc-dev