Merge changes Ia6300c23,Idd2ae8ad into klp-dev

* changes:
  Camera2: Immutable metadata
  Camera2: Listener rework and other API updates