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