Merge "Settings: Bring back Uptime" into p9.0