Merge "Update test for 400dpi and xxxhdpi" into klp-dev