Themes: Pass resource IDs instead of bitmaps [2/2]

Change-Id: Ibd89d7fdcdd2ac3719f5b8a469b8b9f361760033
Merge branch 'cm' into HEAD