Merge "Add activity-aliases to keep shortcuts from GB and HC working"