Merge "Adding system window flag in DWPC"