Merge "Camera: Consider the currently acquired input buffers" am: fc0fa0c91b am: 55982d66b6
am: e71a799bf7

Change-Id: I6a0cd4d8cb3843237979bac419f4bf0c4a9c6f82