Merge "API review correction: rename NAS.onActionClicked -> onActionInvoked."