Merge "system property: property set without time spent asleep"