Merge "Use PackageManager.FEATURE_CONTROLS to decide availability" into rvc-dev