camera: Fix hang when changing picture size - CM

Change-Id: I46d060d470b96be56d84f273accf54702e72b321

Conflicts:
	src/com/android/camera/PhotoModule.java