Merge "Relax restrictions on supported API levels" into main