Merge "Camera: clear buffer cache when stream is reconfigured"