Merge "Wait for completion of device mapping in mountObb"