Merge "Zen: Add content description to settings icon." into lmp-dev