Switch back to CM frameworks av+native and Camera