Merge "Fix incorrect style parent"