Merge "Changed name of recent hasLayout() method to isLaidOut()"