Update initComponentActivity.
More updates
Merge branch 'develop' into feature/recommendationTest
Update pattern