Merge "Reset component enabled settings when clearing app data"