Revert "Revert "Kernel camera fix.""

This reverts commit 86ad9d50e199306b016956d7e658f0c7bfa53718.