Merge "Revert "Changed the size of MockView according to resolution."" into kitkat-cts-dev