cherry pick upower1 patch for mate-session-manager