Merge "Re-fixing content descritpion on quick settings toggle. Bug: 7362316" into jb-mr1-dev