Merge "SurfaceFlinger: Prevent deadlock by updating an atomic layer set." into lmp-dev