Merge "Update QuickStepContract.getWindowCornerRadius API"