Merge "Fix OHM DA Organizer do not update display bounds by orientation" into sc-dev