Merge "Fix CameraEvictionTest task stack ordering." into mnc-dev