Merge "Stop using splitActionBar"