camera: squashed updates from kk_2.7
Changes from THLG for test