Merge "Initial pass at some preload drawables Bug: 5020126"