Merge "smdk4412-common: camera: don't defer picture if CAF is in progress" into cm-11.0

Change-Id: Ib71f652d68a45ad73db287b8d3e74670acb0ab7c