Merge "Fix issue with activity reuse for aliased components." into nyc-dev