Merge "Fix a layout hierarchy bug"