Merge "Default app enumeration to off"