Merge "Fixed activity not started for current user" into main