Merge "Camera: fix status tracker race condition"
am: 980796c318  -s ours

Change-Id: I3a3ab00f0b5586f62697677ac3c0414e5b132b9f