Merge "Fix animation mismatch between privacy chip and persistent dot" into udc-qpr-dev