Merge "Better preload drawable logging"