Merge "Fix Color Clock on AOD" into tm-qpr-dev