camera: squashed updates from kk_2.7