Merge "Fix theme cannot change due to there is no wallpaper colors." into pi-dev
am: dee98726bf

Change-Id: Ic1c76d95bcd9e16c8209e948fc06bd90d4207de7