Merge "Adjust theme for graphicsstats test app" am: 8c00e3add0
am: ffb0ab2f84

Change-Id: Ib43ab48fc3b5d669cf9b6b23e0acd76b63e6d123