Merge "Disable handling display change transition for remote"