Merge "Fixes overview connecting to correct launcher when changing users"