Merge "Update display contents when metrics change" into oc-dev
am: d6f0b0fc4f

Change-Id: I808ab4d68954773ba8c8691478d9fe47e1e2378f