Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1