Merge "Use OnImageAvailableListener to wait for buffer" into sc-dev