Merge "Add new window type TYPE_DRAWN_APPLICATION" into nyc-mr1-dev