Merge "Creates flag for controling which Quick Tap framework is used" into tm-qpr-dev