Merge changes from topic "am-41f9afcdad0c4a3e9075d0ddb9a56df8"

* changes:
  Merge changes from topic "am-a1fcadbfefe74c91b3bdd1839738664e" into udc-qpr-dev-plus-aosp am: f8415874 -s ours
  [automerger skipped] Merge "Invalidate buffers on transform change" into tm-qpr-dev am: 00a8c5bc -s ours am: 1bdf6d26 -s ours am: a2fda6d6 -s ours am: 1c8aa018 -s ours am: 120e91e6 -s ours