Merge "Prevent display of incorrect widget title on orientation change"