Merge "Adding flag for material U popup" into tm-qpr-dev