Revert "camera: Fix hang when changing picture size - CM"

This reverts commit 5ec00953be72e508d112a3069dd227d82423d6e5.