Merge "Prevent scaling of clocks based on accessibility" into tm-qpr-dev