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

Change-Id: I80acb0ae322d9bfd5f3e2d52a569f080822b3a01