Merge "Remove incorrect isEnabled() check"