Merge "Stk: Icon related changes" into mnc-dr-dev