Merge "Revert "Use floating-point value for Drawable level""