Merge "Support self-explanatory icon for PLAY TONE command"