Merge "Fix build, fix Drawable loop" into lmp-preview-dev