Merge "SurfaceFlinger: lock mStateLock when modifying allowed configs"