Merge "Replace action button "Uninstall" with "Restart"" am: cedf22960e

Change-Id: I24bc2dd13967c611c34e8d2b287ba991f8c838d4