Merge "Start accounting for page margins for ACTION_UP events." into mnc-ub-dev