Merge "Make sure background drawables are correct when View is attached"