Merge "Taking userId into account for fixupAppDir()." into rvc-dev