Merge "[MultiUser] Ensure sysyuig activities use user 0" into tm-dev