am c8f4e1bc: Fix a couple regressions from resetting AppsCustomizeTabHost

* commit 'c8f4e1bc88401cad3cc5e439cd08450974d99d81':
  Fix a couple regressions from resetting AppsCustomizeTabHost