Merge "Change to use InheritedVisibilityChangedSignal" into devel/master