Merge "Merge "Make sure to remove child views when recreating notification menu row" into oc-dev am: 1e943b3ef0 am: 4ba5995a87"