Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev