Merge "Do not defer wm display logic when called from am."