Merge "ENABLE_TWOLINE_ALLAPPS to true" into main