Merge "Setup: Remove scopedProfileIn() calls"