resolve theme bug

Change-Id: I01252a39472b03d0de605d9d38e1405e78b0ce9b
Merge branch 'song-master' into dev
support style and system theme

Change-Id: I9576fa64a8b6675dafe4256b7655fe0da7c9e3f0
Merge branch 'dev'

Change-Id: I6f8d2e3c7f7dd39c143715d119173d7fbd5b3887