Merge "DO NOT MERGE: Hide new camera API." into klp-dev