Merge "Framework did not notifyDisplayInfoChanged"