Merge "Use self-locking for mAvailableFeatures"