Merge "Use new hierarchy viewer protocol in all View subclasses" into mnc-dev