Merge "Remove custom layout for expandpreference."