Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev