Theme fixes

Change-Id: I3bfe2b8d3434f9a6ff75564fa09260e8de5566c3
cherry-pick fixes

Change-Id: I12d56ca62d80df733058bdce252cb6a29f671a7d