Fix #16717 - Make main drawer sync call async and remove the reflow issue