Resolve merge conflicts of 25ca01b0 to ub-deskclock-gatling

Bug: 29419807

Resolving merge conflicts. A few minor things were added or changed to
get the app to look good with the differences while still using 
recyclerview. These changes affect the attached bug.

Change-Id: Iac24f091a5f85dfab2d6051bca3a2b0cb08e2df5