Merge "Check component before notifying activity is visible." into oc-dev