Merge "Frameworks: Handle exceptions in SystemProperties callbacks" into pi-dev