Merge changes from topic "am-a1fcadbfefe74c91b3bdd1839738664e" into udc-qpr-dev-plus-aosp

* changes:
  [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
  [automerger skipped] Invalidate buffers on transform change am: 5545b1cc -s ours am: c2b23194 -s ours am: cb39c75e -s ours am: 71ac2fb2 -s ours