Revert "Revert "Cleanup camera""

This reverts commit a0a4429cbefd17f9a3d092acc553878da7b874e5.
Revert "Revert "Not available in omni's camera app""

This reverts commit 36f30bf6077e3011ffaad2c78621b2ff67f3ca5f.