Merge "Bring action bar up to spec (E3)"