Merge "Cache WindowManager in StrictMode; add android.util.Singleton"