Merge "Clean up Icc Refresh handling"