Merge "Guard against null info when applying widget RROs" into sc-dev