Follow changes to FragmentTabManager to continue to work correctly with it. Fix the code in the base API demo (which can't use FragmentTabManager) to work correctly. Bug #7232088: ListView saved state being lost in some cases Change-Id: Ib7ba1ab20ff00f2cc95c9f6024ab94783237c9be