Merge "Initial changes to stack layout to support paging and nonsquare thumbs."