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

Change-Id: I58d215ae33994274a364ec71ba59bae25e0e1c12