Merge "Remove uneeded code now that onActivityUnpinned is called" into main