Merge "Camera: add FMQ size override logic" into pi-dev am: de680c0d0c
am: 7a83eaa56d

Change-Id: I41c60aa080a29fffcf0d7cf8620f7559608a74a3