Merge "Update bg drawable properly on ActionBars based on earlier changes"