Merge "Updating layouts to use frame vs translation and clipping."