Merge "Enable Linux terminal app via developer settings" into main