resolve theme bug

Change-Id: I01252a39472b03d0de605d9d38e1405e78b0ce9b
Merge branch 'song-master' into dev