Merge "Only notify of visibility changes if actually changed" into mnc-ub-dev