Merge "Indicator for task auto-select"