Merge "Make system property reading in LayoutlibLoader more DRY" into main