Merge "Do not listen to clock change if should hide clock" into udc-dev