Merge "Added onDisplayAreaChanged and unregister for DisplayAreaOrganizer" into rvc-dev