Merge "Finish EditWidgetsActivity when stopped." into main