Merge "Check key intent for selectors and prohibited flags" into tm-qpr-dev