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

Change-Id: Ieca77a5bf51b92666941f6d7ad0c675ef20adc68