Merge "Inject AppCompatConfiguration to WindowManager" into main