Merge "Allow skipping camera layers for HDR callback" into tm-dev