Merge pull request #661 from Koloto/v4/componentIcon

v4: don't change an icon while switching clock/calendar
Merge remote-tracking branch 'remotes/origin/v4beta' into v4merged