Merge "Update on reboots, package uninstalls" into sc-dev