Merge "Fix deadlock conditions in Camera3Device." into mnc-dev