Merge "Postpone reporting fully drawn until app is drawn"