Merge "Ignore views that appear and disappear" into mnc-ub-dev