Merge "Mock resolveSecondaryHomeActivity for test"