Merge "Compose default divider height should be 0" into ub-gmail-ur14-dev