Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev