Merge "Add missing check in getKeyguardDisabledFeature" into sc-v2-dev