Merge "Remove unused argument 'layers' from renderFrameImpl and renderOverdraw"