Merge "Camera API 2, Device 2/3: Implement idle and shutter callbacks" into klp-dev