Merge "Use singleton WindowManagerService for testing"