Merge "Remove use of private style"