Fix build for app specific themes

Change-Id: I3400695ecd4b500b4aaa740fde6c2f4583f30ca6