cherry pick mate-session-manager upower1 API support