am d0c9619f: (-s ours) am 99e7b894: Add in cache values for non-xlarge screens DO NOT MERGE

* commit 'd0c9619f711eecb9e5b79ed43d4c9e20c9297483':
  Add in cache values for non-xlarge screens DO NOT MERGE