Merge "Fix flash of uninitialized surface" into mnc-dev