camera: sync with CAF

Change-Id: Ie4725f8662fefce8079fe4a73ed00264c3913df2