Merge "Make sure to remove child views when recreating notification menu row" into oc-dev