am 22e2eca6: Merge "Simplify projection matrix management."

* commit '22e2eca672458409233ddb96ac81f4edbeb6a0b3':
  Simplify projection matrix management.