Merge "Account for rounding in computing screen percentage." into oreo-mr1-cts-dev