Merge "TouchLatency: upgrade to gradle 4.8.1" into sc-dev