Merge pull request #2129 from Sonicadvance1/shuffle_user_dir Move user directory detection location to UICommon.
