Merge "Camera: fix errorFlag logic" into pi-dev am: 4ccefebb78
am: fbb5c56f81

Change-Id: Id6b26fb903b31db38e0ec51d4fe2eeeefd9268c3