Merge "Reroute surfaceflinger pulled atoms" into sc-dev