Merge changes I24640ffb,I5c0ede96 into pi-dev

* changes:
  Camera: fix metering region conversion
  Camera: DistortionMapper: Move FACE_RECTANGLES to point list