am 1f21d2a8: Merge "Hide floating toolbar when user interacts with screen." into mnc-dev

* commit '1f21d2a8b15d088ab50a62cbc389e88c09d141c1':
  Hide floating toolbar when user interacts with screen.