Just returning the function is simpler looking
Some tidying to boot steps
Gallery should also not be show if we are in 'secure mode'
Remove properties that are no longer used from camera state