Merge "Relace BuildCompat.isAtLeastS to check Build.VERSION.SDK_INT" into sc-dev