Merge "Add (hidden) fixupAppDir() API." into rvc-dev