Merge "Always show time remaining estimate string in QS"