Merge "Adjust theme for graphicsstats test app" into pie-cts-dev