Merge "Add content descripiton to shortcut setting for meaningful labels."