Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1