Merge "Show system uptime in bugreport (dumpsys alarm)" into pi-dev