Merge "CROSS_SIM: Use extras to trigger update to properties"