Merge pull request #7743 from majewan/bug796798

BUG 796798 - [settings] colorized bar chart missing from media storage s...(cherry picked from commit 3df466a3a11c898adc1874c59784ce83a3bab300)
(cherry picked from commit 22e114145ec6e9c37078a44d5b3a6fc72d5276d4)

Merge pull request #8293 from evelynhung/issue-842215

bug 842215 - some tweaks to improve performance(cherry picked from commit e8cb49b8782d93a197a927b48cd4c374268f7a37)