SOS-1638 Move non portal props to portlet props.
SOS-1638 Handle null case for extraData
SOS-1638 SF