Merge "Camera: Remove redundant RequestThread wait during flush" into tm-dev