Merge "Revert "Finish EditWidgetsActivity when stopped."" into main