Merge "Add demo clock picker" into tm-qpr-dev