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

Change-Id: I6aa4903673eaf099a77eaf90d95abfacca550ea3