Make sure to update theme capabilities.

Change-Id: I42970fd98e629bde8f32d698b67892ba7b8e6965
Merge branch 'cm-11.0' into kk_mkt