Merge "Fix startActivity for multi-user issue HSUM mode" into main