Merge "Make window manager cts apps debuggable"