Merge changes from topic "am-6308a3311a4b402eb9e072d5a567d15c"

* changes:
  [automerger skipped] Merge "Check key intent for selectors and prohibited flags" into rvc-qpr-dev am: 7b2b2630 -s ours am: 5eb26bd5 -s ours am: 3e7ab1d8 -s ours am: 38c7b8c9 -s ours am: ef080cb4 -s ours am: 87fbce55 -s ours am: c27c09d3 -s ours am: 4fee3152 -s ours
  [automerger skipped] Check key intent for selectors and prohibited flags am: f7ba4ef2 -s ours am: d1e2d06c -s ours am: 9b2f1f26 -s ours am: a772442b -s ours am: 47eec46b -s ours am: 5119853f -s ours am: 56a33cf4 -s ours am: d6039e2d -s ours