Merge "Fix a bug in timeshift mode" into udc-dev