Merge "camera2: Treat face detect mode larger than FULL as FULL" into pi-dev