Merge "Don't disable APIs which ensure the contrast of system bars" into main