Merge "Verify drawables added to ViewOverlay so they can be scheduled"