Merge "Fix setting action bar backgrounds after layout"