Merge "Revert "Fix overlapping issue for Add a language page""

package com.android.settings.localepicker;

import android.app.FragmentTransaction;

import android.app.ListFragment;

import android.content.Intent;

import android.os.Bundle;

import android.view.MenuItem;

                .commit();

    }

    @Override

    protected void onStart() {

        super.onStart();

        final ListFragment listFragment =

                (ListFragment) getFragmentManager().findFragmentById(R.id.content_frame);

        listFragment.getListView().setNestedScrollingEnabled(true);

    }

    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        if (item.getItemId() == android.R.id.home) {