Merge "snap: update icon" into n7.1-caf