Merge "Reroute surfaceflinger atoms through system server" into sc-dev