Merge "Added Keywords for Device Theme"