Merge "Fix glop rendering within unclipped saveLayers"