Merge "Fix onDisplayAreaInfoChanged called before onDisplayAreaAppeared" into main