Merge "Start widget configuration activity if needed" into main