Merge "fix delay when shutting down wifi display"