GitLab

Fixes tests broken in Touchable Refresh and changes them from being tested in
Touchable to Touchable Refresh.

Also does some other cleanups.  This does not remove flags added during refresh
(e.g. NTB position); those will be added separately.

Bug: 814847
Change-Id: I8c31a0421c65c4cd46f287d9e67aa17645089703
Reviewed-on: https://chromium-review.googlesource.com/1232882Reviewed-by: Allen Bauer <kylixrd@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592529}