Merge "Fix API review: Camera prewarm" into mnc-dev