Merge "Camera: use finer lock in external camera OutputThread" into pi-dev