Merge changes from topic "am-12a93de0fb82435abb9d75e12bd1113c"

* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix VrDisplayTest failure" into rvc-dev am: 936cd3b3f1 am: 912dc1511c -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Fix VrDisplayTest failure am: 8d71bdf3e6 am: b0d222b4a1 -s ours