Merge "[ExpressiveBattery] Replace LayoutPreference with IntroPreference." into main