Merge "[1/n] Create Configuration for CompatUX Enhancements" into tm-qpr-dev