Merge "Fix idling resource in swipe test" into mnc-ub-dev am: 1f09d40c1f
am: be4665eec1

* commit 'be4665eec16e9158dce5316f9d0a3a9e3cec8f05':
  Fix idling resource in swipe test