Merge "Action bar rendering in layoutlib"