Merge "Enable the WM shell command to support the secondary display"