msim: Add missing changes from New Theme Engine [1/6]

Change-Id: I52051a8cefd0d4632d2a2255a03689cc037e6995
Merge remote branch 'cm/cm-11.0' into cm-11.0