am 84551d61: am 6fdab993: am 86d86c2e: am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev

* commit '84551d61fd4942aa4afb677ea3ae6ce7674c866c':
  Camera2: Handle surface size change