Merge "Message view: Use system tab style"