Merge "Fix drawable handling for ActionBarContainer" into jb-mr1-dev