Merge "Update the app window's thumbnail layer after starting window is removed" into oc-dev