Merge "Make createView always return a single parent view" into jb-ub-mail-ur8