Merge "No split action bar in screens with one action"