Merge "Add new view type. b/10488449." into jb-ub-mail-ur10