Merge "Check component before notifying activity is visible." into oc-dev am: 13acf25cfd
am: 6b8907d8ed

Change-Id: Ife37bdfb4bee6479688defad0446efaecfb7838b