Merge change I69220990 into eclair

* changes:
  Fix for 2155255: Revert "Cache inflated view to avoid inflation of layouts in preferences"