Merge "Defines flag for ravemped WPP UI (3/5)." into tm-qpr-dev