Merge "Use start/finish app ops in window manager"