Merge "Revert "Revert "Enable DemoMode for new QS clock""" into tm-qpr-dev