Merge with cm

 *Merged up to "New Theme Engine [5/6]"

Change-Id: Ia85354f682d1686b6403067f2318045d8a29eba9