Merge "Put creation of frro from AssetFileDescriptor behind a flag" into main