[KitKat] Don't merge camera commits for now