Merge "Addresses setRequireUserAction API feedback" into sc-dev