Merge "Hide floating toolbar when user interacts with screen." into mnc-dev