Merge "Pinned apk file should be put in mPinnedFiles." into main